From 76019fad0e760d4a804754d949c89864bc5781d5 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Sat, 13 Sep 2014 16:20:44 +0200
Subject: [PATCH] Adwaita: osd progressbar fixes

See https://bugzilla.gnome.org/show_bug.cgi?id=735959
---
 gtk/resources/theme/Adwaita/_common.scss      | 28 +++++++++++--------
 .../theme/Adwaita/gtk-contained-dark.css      | 11 +++++---
 gtk/resources/theme/Adwaita/gtk-contained.css | 11 +++++---
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 76fcb82320..a63ba50581 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -2043,15 +2043,20 @@ $asset_suffix: if($variant=='dark', '-dark', '');
  *****************/
 
 GtkProgressBar {
-    padding: 0;
-    font-size: smaller;
-    color: transparentize($fg_color, 0.6);
-    box-shadow: inset 1px 1px transparentize(black, 0.9), // needs to be set
-                _widget_edge();                           // here ot it gets
-                                                          // clipped
-    &:backdrop {
-      color: $backdrop_insensitive_color;
-    }
+  padding: 0;
+  font-size: smaller;
+  color: transparentize($fg_color, 0.6);
+  box-shadow: inset 1px 1px transparentize(black, 0.9), // needs to be set
+              _widget_edge();                           // here ot it gets
+                                                        // clipped
+  &:backdrop {
+    color: $backdrop_insensitive_color;
+  }
+  &.osd {
+    -GtkProgressBar-xspacing: 0;
+    -GtkProgressBar-yspacing: 0;
+    -GtkProgressBar-min-horizontal-bar-height: 3;
+  }
 }
 
 // moving bit
@@ -2091,11 +2096,10 @@ GtkProgressBar {
     box-shadow: none;
   }
   &.osd {
+    background-image: none;
+    background-color: $selected_bg_color;
     border-style: none;
     border-radius: 0;
-    -GtkProgressBar-xspacing: 0;
-    -GtkProgressBar-yspacing: 2px;
-    -GtkProgressBar-min-horizontal-bar-height: 2px; //FIXME still too tall
   }
 }
 
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 3bd93d5c83..3d1d30d707 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -3235,6 +3235,10 @@ GtkProgressBar {
   box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
   GtkProgressBar:backdrop {
     color: #5d6767; }
+  GtkProgressBar.osd {
+    -GtkProgressBar-xspacing: 0;
+    -GtkProgressBar-yspacing: 0;
+    -GtkProgressBar-min-horizontal-bar-height: 3; }
 
 .progressbar {
   background-image: linear-gradient(to bottom, #215d9c 2px, #266cb5);
@@ -3264,11 +3268,10 @@ GtkProgressBar {
     background-color: #215d9c;
     box-shadow: none; }
   .progressbar.osd {
+    background-image: none;
+    background-color: #215d9c;
     border-style: none;
-    border-radius: 0;
-    -GtkProgressBar-xspacing: 0;
-    -GtkProgressBar-yspacing: 2px;
-    -GtkProgressBar-min-horizontal-bar-height: 2px; }
+    border-radius: 0; }
 
 GtkProgressBar.trough {
   border: 1px solid #1c1f1f;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 20cb00da25..0c4d7f3e76 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -3385,6 +3385,10 @@ GtkProgressBar {
   box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
   GtkProgressBar:backdrop {
     color: #c7c7c7; }
+  GtkProgressBar.osd {
+    -GtkProgressBar-xspacing: 0;
+    -GtkProgressBar-yspacing: 0;
+    -GtkProgressBar-min-horizontal-bar-height: 3; }
 
 .progressbar {
   background-image: linear-gradient(to bottom, #4a90d9 2px, #63a0de);
@@ -3414,11 +3418,10 @@ GtkProgressBar {
     background-color: #4a90d9;
     box-shadow: none; }
   .progressbar.osd {
+    background-image: none;
+    background-color: #4a90d9;
     border-style: none;
-    border-radius: 0;
-    -GtkProgressBar-xspacing: 0;
-    -GtkProgressBar-yspacing: 2px;
-    -GtkProgressBar-min-horizontal-bar-height: 2px; }
+    border-radius: 0; }
 
 GtkProgressBar.trough {
   border: 1px solid #a1a1a1;
-- 
2.30.2